Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 05:57:58 +0000 (05:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 05:57:58 +0000 (05:57 +0000)
commit3ce9806d31bb655c6d5346aad85210f9615e70e5
treee0032c917e41eda8417becd1cd94744d0486db4d
parent5e505d1732bece805560d276fab33d210f452ff2
parent846c07ba54cb3bc9c6edd0302f83c21764fdadfe
Merge from mainline.